Skip to content

ext/curl: Fix failing tests due to string changes in libcurl 8.6.0 #13292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

Ayesh
Copy link
Member

@Ayesh Ayesh commented Jan 31, 2024

Upstream libcurl 8.6.0 contains a change1 that caused a test failure. This fixes it by updating the test's EXPECTF to use a regex to account for both string patterns.

Footnotes

  1. https://github.com/curl/curl/commit/45cf4755e71f#diff-a8a54563608f8155973318f4ddb61d7328dab512b8ff2b5cc48cc76979d4204cL1683

@Ayesh Ayesh requested a review from adoy as a code owner January 31, 2024 20:06
Ayesh referenced this pull request Jan 31, 2024
Bumps the minimum required libcurl version to 7.61.0.

Please also see #4917, which bumped minimum libcurl version to the current >= 7.29.0.
This bumps the minimum requirement to Curl 7.61.0 (released 2018 Sept).

Ubuntu, Debian, RHEL, and RHEL derivatives have major and LTS version bumps this year. Following are the
libcurl-dev/libcurl-devel versions available in the oldest supported (LTS or otherwise) in major OSs.

 - Debian buster: [7.64](https://packages.debian.org/buster/libcurl4-openssl-dev)
 - Ubuntu 20.04: [7.68](https://packages.ubuntu.com/focal/libcurl-dev)
 - CentOS/RHEL 7: 7.29
 - RHEL 8/Rocky 8/EL 8: 7.61
 - Fedora 38: 7.87

RHEL/CentOS 7 reaches EOL mid 2024, so for PHP 8.4 scheduled towards the end of this year, we can safely
bump the minimum libcurl version.

7.61.0 was selected as the new minimum because RHEL and derivatives have libcurl-devel version 7.61. RHEL 8 is
a current and supported RHEL version.
Upstream libcurl 8.6.0 contains a change[^1] that caused a test failure.
This fixes it by updating the test's `EXPECTF` to use a regex to account for both string patterns.

[^1]: curl/curl@45cf4755e71f#diff-a8a54563608f8155973318f4ddb61d7328dab512b8ff2b5cc48cc76979d4204cL1683
@nielsdos
Copy link
Member

This should target branch PHP-8.2.

@Ayesh Ayesh changed the base branch from master to PHP-8.2 January 31, 2024 20:19
@Ayesh Ayesh changed the base branch from PHP-8.2 to master January 31, 2024 20:20
@Ayesh Ayesh force-pushed the libcurl-8-6-0-test-fixes branch from 7ed41e4 to 6fc6d4e Compare January 31, 2024 20:21
@Ayesh Ayesh changed the base branch from master to PHP-8.2 January 31, 2024 20:22
@Ayesh Ayesh changed the base branch from PHP-8.2 to master January 31, 2024 20:26
@Ayesh Ayesh changed the base branch from master to PHP-8.2 January 31, 2024 20:26
@Ayesh Ayesh changed the base branch from PHP-8.2 to master January 31, 2024 20:28
@Ayesh
Copy link
Member Author

Ayesh commented Jan 31, 2024

Thank you @nielsdos - I created a new PR #13293 to replace this one.

@Ayesh Ayesh closed this Jan 31, 2024
@Ayesh Ayesh deleted the libcurl-8-6-0-test-fixes branch February 27, 2024 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants